--- Makefile.orig	Thu Sep  3 08:03:19 2015
+++ Makefile	Tue Sep  8 21:22:53 2015
@@ -13,7 +13,7 @@
 #
 
 CC      = gcc
-CFLAGS  = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
+CFLAGS  += -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
           -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef
 
 # Let lseek and mmap support 64-bit wide offsets
@@ -23,7 +23,7 @@ CFLAGS += -D_FILE_OFFSET_BITS=64
 #CFLAGS += -DALIGNMENT_WORKAROUND
 
 # When debugging, disable -O2 and enable -g.
-CFLAGS += -O2
+#CFLAGS += -O2
 #CFLAGS += -g
 
 # Pass linker flags here
@@ -114,28 +114,28 @@ install : install-bin install-man install-doc
 uninstall : uninstall-bin uninstall-man uninstall-doc
 
 install-bin : $(PROGRAMS)
-	$(INSTALL_DIR) $(DESTDIR)$(sbindir)
+	$(INSTALL_DIR) $(sbindir)
 	for program in $(PROGRAMS) ; do \
-	$(INSTALL_PROGRAM) $$program $(DESTDIR)$(sbindir) ; done
+	$(INSTALL_PROGRAM) $$program $(sbindir) ; done
 
 uninstall-bin :
 	for program in $(PROGRAMS) ; do \
 	$(RM) $(DESTDIR)$(sbindir)/$$program ; done
 
 install-man :
-	$(INSTALL_DIR) $(DESTDIR)$(man8dir)
+	$(INSTALL_DIR) $(man8dir)
 	for program in $(PROGRAMS) ; do \
-	$(INSTALL_DATA) man/$$program.8 $(DESTDIR)$(man8dir) ; done
+	$(INSTALL_DATA) man/$$program.8 $(man8dir) ; done
 
 uninstall-man :
 	for program in $(PROGRAMS) ; do \
 	$(RM) $(DESTDIR)$(man8dir)/$$program.8 ; done
 
 install-doc :
-	$(INSTALL_DIR) $(DESTDIR)$(docdir)
-	$(INSTALL_DATA) README $(DESTDIR)$(docdir)
-	$(INSTALL_DATA) CHANGELOG $(DESTDIR)$(docdir)
-	$(INSTALL_DATA) AUTHORS $(DESTDIR)$(docdir)
+	$(INSTALL_DIR) $(docdir)
+	$(INSTALL_DATA) README $(docdir)
+	$(INSTALL_DATA) CHANGELOG $(docdir)
+	$(INSTALL_DATA) AUTHORS $(docdir)
 
 uninstall-doc :
 	$(RM) -r $(DESTDIR)$(docdir)
